Backport test abort on timeout to v6.x #11354
+22
−6
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.